More test.
Fix.
Typo.
Move fixing stuff to fixer.
Modularize things somewhat.