Bug fixes, cleanup, rewind buffer experiments...