various updates
more reshuffling