Pull request for patches mainly and a few features

Boo, need for patches. Yay, new features!