Added better stopping and moar stopping!