added time off adjustment
some more cleanup