added TODO bug fix, fixed typo