Fixed charging by user
Added support for refunds.