Develop

Here you are! I hope these are all the changes you wanted made. If anything, I'll just add in whatever suggestions you have. :)