Added random slew stuff done over weekend..

Potentially things are more broken now, I just don't know.. Better to
keep all changes in the pull request in any situation..