Support for String Definitions

some other small corrections