bugfixes to layouter / more efficency