waypoints system added - bugs fixed