General improvements on all application