Config and misc changes. Profiling