Multiple Changes

Its done. And I'm merging it myself because I have to deploy it right now.