Fix: Removed Navigator, fixed claws and lots of magic numbers