Better field parsing, printing. Some method renames.