Few TODOs eliminated, some other commented on