Various additions and fixes

See Readme for Changelog