Various updates on plane
Merged code
Refactored and updated for new query results; updated NuGets