fixed everything
tests OK
fixed hours