Improve text animation and small fixes