#24 corrections and firts part of refund