Improved profiling, added scent map, almost ready for tests