Improved profiling. Fixed Configuration options.