comment and field fixes per #61 and #62