Bug fixes to "income statement", work in progress