Various changes (and not time to write them all down)