moved parser, and added some more java doc and comments