Added waypoints, fixed out of combat bug.