various updates and simplifications