Fixed playback bugs and inconsistencies for issue #38 .