Fixed up hour-table and expense-table functions