2.1.6 update

pulling in super's latest updates to make sure i'm working with latest code