Some gammar improvements

Not finished, but but I want to run the tests :)