final fixes
I consider this done.