Single observation intent, bugfixes