fixing animations and some more highlighting