Spruced up profiler, need to finish up tests