docs and todos updated