Animation improvement and some other fix