Updating a few things

Check out the commits.