fixed some string issues