various updates, preparing for new UI