bug fixes and get rid of .ToString()s