Fixes fixes and fixes.
Mostly formatting.