added some javadocs, about to merge into develop and split another package for parsing