Added some intelligence to land method

Also changes waypoint names to more appropriate ones