Add expense documentation and some fixes