Pull request for fixed features

Yay for fixing things, yay for features, yay for etc.!