minor bug fixes (issues #2 and #3)