Testing and simplification of LEES_EDWARDS
fixing non-LEES_EDWARDS
fixed up errorhandling
Merge branch 'espresso'