updated and fix bugs on payroll