More TODO, prettier comments