taking care of TODOs. Turning off profiler spam in most versions of the demo