GUI-696
cleaned up TODOs, labeled remainders for post 4.0