more improvements, mostly for robustness