updates for working hours, and rewrite of tools