A bit more cleanup, new comments as my understanding increases.