refs #115 added/edit some comments