renamed expenses_today to expenses, fixed cost and other minor fixes