more work on fixing things for the 2014-05-23 changes
it's a big job - much is still broken