a load of smallish updates :)