Fixed some minor mistakes, added TODO.