Fixed wage bug and added some calculators