Pull request for a bunch of features

Yippee, features! And very few fixes this time.