various updates mostly UI