Adding Nigels feedback and some minor changes