Add NodeInfo. A couple formatting changes to geosupport.