Develop

Hi Jamie,

I created a branch with what I believe to be the more important patches.