a bit of tidying
few tiny tweaks and new animation routine