Fix typos and mistakes per feedback