Semantics unchanged, deleted some TODO comments and added some new ones