Slight change to some regex searches
Missing semi-colon
Support for waypoint statements