final touches - profiling, demo cleanups etc.