a few tweaks, adding test for space after dsl encountered as last token on line