Pull request for various additions and changes

Yay for variety!