Fixing typos and minor stuff