fixes and string fixes