various updates for 1.3.1