several fixes on expense

several fixes on expense

some fixes on estimate