fix last commit, add todo...