Better play/stop handling and corrected first time play bug