qualified feature names
added constraints to grammar