Merge pull request #59 from kuu/master

Two bug fixes for text issues.
A small change to make debug easier.