Improvements to robustness & formatting