additional notes and tidy up on values