Cleanup, minor doc additions