Correted some shift/reduce conflicts in java grammar; minor improvements.