Updates to stop algorithm, various test updates