Tidied a bit, tweaked a couple of things.