OK some more final changes

Here we go.