Clean up

* import new gps
* updated copyright
* reverted some nfc changes
* misc updates