fix
some TODO cleanup