Various fix and clean up.

Still not fix create animation problem.