Most suggestions edits from Peter - some other work