More TODO items

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>