fixed string bugs
tmp changes