removed profiler, added some comments