made enum for waypoint type and changed all constuctors and references to previous meaningless integers