More updates

Sorry, I couldn't figure out a way to merge all the changes in to one pull request when editing from the github web app.