Expense improvements

Resolves
* Issue #20 
* Issue #21