fixed heuristics to reflect goal location