Expense logic working fine and bugs resolved