Fixing typos and things on the way