working on cleanup and 2.2

2.2 changes