Bug fixes to rewind functionality and start on chat code