fix cartidb -> cartodb
add waypoints