fix small bug and clean up drawShortTerm
update TODO list