some speedup

an example that took 4min two days ago now takes 20s

with Rasmus&Nikos