Minor tweeks

Fixed the issue with the guard getting stuck on his path after chasing
the player and made some other small changes.