Start and stop now take more than one argument
Fix in stop, more helpful start/stop