few fixes; tried to use animation, but failed;