various updates based on combo changes