Improve msging for stop, remove stop conventions