Fixing a couple buggy things

Now it freezes them in place and clears the combat target if they're
frozen while moving.