Updated and streamlined running and plotting scripts