Fixing typos and adding variables for header