refs #59 fix comments etc