Handle comments properly.
Add filename to Exception.