various updates and clean up