Added review comments received from Nick Battle.