Fixes to Time and updates to Employee