grammar and layout update
some more fixes