Fix wildcard <? bug
Fix bug, add test and few productions