fixed some integer/string issues