improved bootstrap grammar a bit for cleaner ast
fixed stuff in building grammars. First tests now succeeding