Loads of small changes with Per.