bug fixes and animation fixes