Fixing typos and adjustments