animation improvements and fixes