Playback working again, other misc. changes/fixes.