various updates after generator coding