animation bugs fixed