Profiling related stuff and performance tuning.  Also merged in newcl changes.