Here are my changes :)

I will go over all my previous commits and send you pull requests instead.