Added Fastplace and Combat speed checks, tweaked waterwalk check