- implemented cancel stop and fixed other minor issues