more bug fixes for test 1.1.4 to pass
more bug fixes, now for 1.1.7 test
all 1.1.x series of tests pass