Minor bug fix, and added TODO!s