Cleanup and document some newer changes