make various updates; all working