big update

Its actually able to stop now, and handle numbers