Adding back commented out code, fixing typos.