A variety of fixes (five commits from JAR)

I checked these commits and the ones that I thought were for smasher aren't, they're for the web app. So please merge all of these commits, they should be good to go.