Add onErrorListener for the MediaPlayer
Remove onErrorListener, as Android will call onCompletion, which is the desired behaviour
Added a few extra comments
Update references to the PlaybackService