fixed a fewthings
Merge branch 'development' of https://github.com/bigdelys/ESS into development