Finished 2.2.1

I skipped a few problems in 2.1.4