further improvements to robustness and style