Fix comment parsing, fix up other stuff.