Arrow death animation, minor fixes and refactoring