added a missing include
closed 2 TODOs