- some little changes + primitive profiler