More small changes to the ESS
Merged changes to ESS