Minor tweaks / fixes
* Added removal of terminator chars at the end of lexed strings