Some updates to the profiler code. Turned off colapse since we no longer output to the user.