fixes for waypoints limits / waypoints adding
added more tests, still lacking a test selector screen