minor cleanings
updated TODO and dependencies