improve almost every thing