fixing some longstanding TODOs