add stop cmd, tweak events