Bug fixes and animation fixes