Added validation and persistence of non-waypoint objects
Various fixes