minor bugfixes and added TODO for observation speed up

1 job for master in 2 minutes and 38 seconds (queued for 27 seconds)