various updates, still fundamentally broken 'til I get time to work on this