all hours update, working on fixing minor errors