fixes and string fixes
Merge pull request #127 from gioman/master

fixes and string fixes