v3.7 - various updates