final version

Only fixes from this point on.