update todos
remove some un-necessary code in comments
hide a debugging printf