Whole lot-o-stuff

Bunch-o-fixes and additions