Unicode fixes

Additional fixes to properly handle unicode input

Unicode fix

Represent strings using unicode() instead of str(). The latter works fine for Python 3, but not 2.7.