Added better track playing and stop monitoring