Some cleanup and better TODOS.