Fixed some bugs, changed states to dot notation, centralized the timers for animation