Added demo sig, bugfixes and demo_trace