some testing and profiling updates