mostly documentation improvements, but also nicer output and field names