Various changes

Temporary state - more coming soon.