* Updates from upstream
* Fixes
* Change registration link
* Correct strings