Added text-option. Misc. bug-fixes.