various updates to working version