Fixing typos and adding todo section