stop() and validate() optimizations and improvements (see changelog.md)