fixes #98
fixes #99
minor comment fix #31