bug fix
overtimecalculation simplified
bug fix for overtimecalculation