duration updating
tweaks
more fixes
fixes
fixes