Added TODOs, cleaned up profiling.