Comments and various updates