updates!

Updates a bunch of stuff that has been squashed into one giant commit
since nobody is reading commit messages but me anyhow.