Updated code about Waypoints. It's based from the content in the long description now.