Fixes

Further add-ons and correction between Evolution and ExpandArray
classes.