Finished up perf enhancements.