Update rest of files (stupid github for windows)

Not sure what was going on but I couldn't perform the entire commit
using Github for Windows as it would keep locking up. I had to do it in
pieces.