Make stop() work

Maybe I'm crazy, but I don't think stop was been working.

Also improved on the retina fix by @restlessdesign