Fix move animation and add some ideas in TODOs.