Changes from review plus more

Signed-off-by: jamienoss <james.noss@lexisnexis.com>