minor comment changes (ToDo etc)