Correct some problems in interline parsing, flesh out Makefile