Unity staging

I actually need the last 3 my changes, but if other changes are also ok, thenk probably it is full pull request :)