Add forcestop and other fixes