[ADD/MOD]added stop button; cleaner code