Added overtime functionality. General code cleanup.