refactor: movement instead of expense, graph improvements