typo. closes #1 and #3