Fixing typos, tostring issues