diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs
index 0a8b360be..da936e735 100644
--- a/src/GF/Canon/CMacros.hs
+++ b/src/GF/Canon/CMacros.hs
@@ -136,6 +136,8 @@ allLinFields trm = case trm of
 ---- deprecated
 isLinLabel l = case l of
      L (A.IC ('s':cs)) | all isDigit cs -> True
+     -- peb (28/4-04), for MCFG grammars to work:
+     L (A.IC cs) | null cs || head cs `elem` ".!" -> True
      _ -> False
 
 -- to gather ultimate cases in a table; preserves pattern list
diff --git a/src/Makefile b/src/Makefile
index 899152df7..d083ecaf3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,7 +46,7 @@ shell:
 clean: 
 	rm -rf */*.o */*.hi *.o *.hi */*.ghi *.ghi *~ */*~
 hugs:
-	hugs -E"open -a emacs" -P$(HUGSINCLUDE)
+	hugs -h10M -P$(HUGSINCLUDE)
 ghci-nofud:
 	$(GHCI) $(GHCFLAGS) $(GHCINCLUDENOFUD)
 today:
diff --git a/src/Today.hs b/src/Today.hs
index 49afb85f8..3cb4fe183 100644
--- a/src/Today.hs
+++ b/src/Today.hs
@@ -1 +1 @@
-module Today where today = "Ons Apr 28 09:03:36 CEST 2004"
+module Today where today = "Tor Apr 29 09:41:39 CEST 2004"