various updates all over the place