change worktime and other fixes