Some field name refactoring, corrected doc, improved coverage