More updates including some profiling.