Profiling and some updates