Added variables for waypoint code, changed some variable names