Corrected some spelling and add todo comments