Added some javaDocs and removed the output format / TXT option.