alot of fixes with animations and timers