whitespaces and another disambiguation check

and adding another additional TODO