Tweaks to monitoring and parameter saving