General Updates

some stuff might worth mentioning