Fixing several bugs within stream
fixing bugs in timeline