fixing some of the accounting