Added todo's plus fixed typos