animations and minor changes