Fixing typos and JS