minor fixes, tiding up code and generating HoursPlans
added tags