Add some comments to Stop and change some methods return type.