simplified grammar
some more documentation