Comments Update

fixes #22