more fixes (2)
Milestone 4 - Timeline + fixes sync

Attempt to sync timeline changes with fixes