Better naming of individual expenses, and bugfixes.