Some class cleanup and partial UI documentation