various updates & formatting fixes