More work, including first pass comments on lib classes