Cleanups and add the corrector to the makefile.  Starting integration with the parser.