Last additions to 3Feb2014 implementation

Also, moved some of the instance variables to the EME_base