Changes to Unity and code

* Back to Unity free.
* Some changes before testing