various updates and tweaks