Added some characters to the grammar, also added java doc and generics