Ch 11 cleanup

and I wouldn't worry about any other details, users should realise this is going to look different on their system