Fixed and tweaked fleeing

- Also minor fixes & improvements