Jh/textbugs

Fixes Issue #41 
Fixes Issue #21