Typos and various updates