more fixes

revert some stuff lost in transition :-)
Merge pull request #2 from andypiper/master

Another set of updates