various updates and fixes for eos