design update + various updates