vim: TODO and slight comment improvements