Fix small stuff
Fix timing
Deer holding rules & refactoring