behavior todos and comments fixed.