Fixing typos and minor issues