basic animation and fixes