Various small improvements

Another of those updates where there's not much to actually see, but all important behind-the-scenes stuff!