adhoc expenses

Finished with adhoc expenses and fixed some bugs