Bookkeeping cleanup and catch-up

Bookkeeping cleanup and catch-up