Renamed purchase into expense plus some fixes and tweaks.