issue #2, typo & bug fixes