2.0.1 changes

NOT READY FOR MERGE

pending other outstanding pull requests