cleanup class
various updates