update TODO, little tweaks