Animation etc. improved