Merge all the branches

There have been a bunch of fixes in various branches. I merged them because it was annoying me at how many there were.