Cleaned up language a bit and added some new animation