Fixed spelling errors, renamed todos