Better handling of string and....

...also prevent some funky state behaviour