Bug Fixes and animation adjustments