v2.2

slight changes since bothered by where i left 2.1 off at