A bunch of stuff

#785