Comments and fixing the profiling aspect (hackily, but what can you do)