diff --git a/bindings/java/doxygen/schema/db_schema_8_6.dox b/bindings/java/doxygen/schema/db_schema_8_6.dox
index cb941f32d2b8d9413815b5e3d28c142bfa894b19..34f0438444941d1434340f753c0d796e99a86e48 100644
--- a/bindings/java/doxygen/schema/db_schema_8_6.dox
+++ b/bindings/java/doxygen/schema/db_schema_8_6.dox
@@ -43,15 +43,15 @@ Name & Value pair table to store any information about the database.  For exampl
 Every object (image, volume system, file, etc.) has an entry in this table.  This table allows you to find the parent of a given object and allows objects to be tagged and have children.  This table provides items with a unique object id.  The details of the object are in other tables.  
 - **obj_id** - Unique id 
 - **par_obj_id** - The object id of the parent object (NULL for root objects). The parent of a volume system is an image, the parent of a directory is a directory or filesystem, the parent of a filesystem is a volume or an image, etc.
-- **type** - Object type (as org.sleuthkit.datamodel.TskData.ObjectType enum).
+- **type** - Object type (as org.sleuthkit.datamodel.TskData.ObjectType enum)
 
 
 # Data Source/Device Tables 
 ## data_source_info
-Contains information about a data source, which could be an image.  This is where we group data sources into devices (based on device ID)
+Contains information about a data source, which could be an image.  This is where we group data sources into devices (based on device ID).
 - **obj_id** - Id of image/data source in tsk_objects
-- **device_id** - Unique ID (GUID) for the device that contains the data source. 
-- **time_zone** - Timezone that the data source was originally located in. 
+- **device_id** - Unique ID (GUID) for the device that contains the data source
+- **time_zone** - Timezone that the data source was originally located in
 - **acquisition_details** - Notes on the acquisition of the data source
 
 
@@ -67,7 +67,7 @@ Contains information about each set of images that is stored in the database.
 - **md5** - MD5 hash of the image (for compressed data such as E01, the hashes are of the decompressed image, not the E01 itself)
 - **sha1** - SHA-1 hash of the image
 - **sha256** - SHA-256 hash of the image
-- **display_name** - display name of the image
+- **display_name** - Display name of the image
 
 ## tsk_image_names
 Stores path(s) to file(s) on disk that make up an image set.
@@ -87,7 +87,7 @@ Contains one row for every volume system found in the images.
 ## tsk_vs_parts
 Contains one row for every volume / partition in the images. 
 - **obj_id** - Id of volume in tsk_objects
-- **addr** - Address of this partition
+- **addr** - Address of the partition
 - **start** - Sector offset of start of partition
 - **length** - Number of sectors in partition
 - **desc** - Description of partition (volume system type-specific)
@@ -102,7 +102,7 @@ Contains information about pools (for APFS, logical disk management, etc.)
 ## tsk_fs_info
 Contains one for for every file system in the images. 
 - **obj_id** - Id of filesystem in tsk_objects
-- **data_source_obj_id** - Id of the data source for this file system
+- **data_source_obj_id** - Id of the data source for the file system
 - **img_offset** - Byte offset that filesystem starts at
 - **fs_type** - Type of file system (as org.sleuthkit.datamodel.TskData.TSK_FS_TYPE_ENUM)
 - **block_size** - Size of each block (in bytes)
@@ -110,17 +110,17 @@ Contains one for for every file system in the images.
 - **root_inum** - Metadata address of root directory
 - **first_inum** - First valid metadata address
 - **last_inum** - Last valid metadata address
-- **display_name** - Display name of file system (could be volume label) (New in V3)
+- **display_name** - Display name of file system (could be volume label)
 
 ## tsk_files
 Contains one for for every file found in the images.  Has the basic metadata for the file. 
 - **obj_id** - Id of file in tsk_objects
 - **fs_obj_id** - Id of filesystem in tsk_objects (NULL if file is not located in a file system -- carved in unpartitioned space, etc.)
-- **data_source_obj_id** - Id of the data source for this file
+- **data_source_obj_id** - Id of the data source for the file
 - **attr_type** - Type of attribute (as org.sleuthkit.datamodel.TskData.TSK_FS_ATTR_TYPE_ENUM)
 - **attr_id** - Id of attribute
 - **name** - Name of attribute. Will be NULL if attribute doesn't have a name.  Must not have any slashes in it. 
-- **meta_addr** - Address of the metadata structure that the name points to.
+- **meta_addr** - Address of the metadata structure that the name points to
 - **meta_seq** - Sequence of the metadata address
 - **type** - Type of file: filesystem, carved, etc. (as org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM enum)
 - **has_layout** - True if file has an entry in tsk_file_layout
@@ -128,7 +128,7 @@ Contains one for for every file found in the images.  Has the basic metadata for
 - **dir_type** - File type information: directory, file, etc. (as org.sleuthkit.datamodel.TskData.TSK_FS_NAME_TYPE_ENUM)
 - **meta_type** - File type (as org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM)
 - **dir_flags** -  Flags that describe allocation status etc. (as org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM)
-- **meta_flags** - Flags for this file for its allocation status etc. (as org.sleuthkit.datamodel.TskData.TSK_FS_META_FLAG_ENUM)
+- **meta_flags** - Flags for the file for its allocation status etc. (as org.sleuthkit.datamodel.TskData.TSK_FS_META_FLAG_ENUM)
 - **size** - File size in bytes
 - **ctime** - Last file / metadata status change time (stored in number of seconds since Jan 1, 1970 UTC)
 - **crtime** - Created time
@@ -140,14 +140,14 @@ Contains one for for every file found in the images.  Has the basic metadata for
 - **md5** - MD5 hash of file contents
 - **sha256** - SHA-256 hash of file contents
 - **known** - Known status of file (as org.sleuthkit.datamodel.TskData.FileKnown)
-- **parent_path** - full path of parent folder. Must begin and end with a '/' (Note that a single '/' is valid).
+- **parent_path** - Full path of parent folder. Must begin and end with a '/' (Note that a single '/' is valid)
 - **mime_type** - MIME type of the file content, if it has been detected. 
 - **extension** - File extension
 
 ## tsk_file_layout
 Stores the layout of a file within the image.  A file will have one or more rows in this table depending on how fragmented it was. All file types use this table (file system, carved, unallocated blocks, etc.).
 - **obj_id** - Id of file in tsk_objects
-- **sequence** - Position of this run in the file (0-based and the obj_id and sequence pair will be unique in the table)
+- **sequence** - Position of the run in the file (0-based and the obj_id and sequence pair will be unique in the table)
 - **byte_start** - Byte offset of fragment relative to the start of the image file
 - **byte_len** - Length of fragment in bytes
 
@@ -155,20 +155,20 @@ Stores the layout of a file within the image.  A file will have one or more rows
 ## tsk_files_path
 If a "locally-stored" file has been imported into the database for analysis, then this table stores its path.  Used for derived files and other files that are not directly in the image file.
 - **obj_id** - Id of file in tsk_objects
-- **path** - Path to where the file is locally stored in a file system.
-- **encoding_type** - Method used to store the file on the disk. 
+- **path** - Path to where the file is locally stored in a file system
+- **encoding_type** - Method used to store the file on the disk 
 
 ## file_encoding_types 
 Methods that can be used to store files on local disks to prevent them from being quarantined by antivirus
-- **encoding_type** - ID of method used to store data.  See org.sleuthkit.datamodel.TskData.EncodingType enum. 
-- **name** -  Display name of technique. 
+- **encoding_type** - ID of method used to store data.  See org.sleuthkit.datamodel.TskData.EncodingType enum 
+- **name** -  Display name of technique
 
 ## tsk_files_derived_method
 Derived files are those that result from analyzing another file.  For example, files that are extracted from a ZIP file will be considered derived.  This table keeps track of the derivation techniques that were used to make the derived files. 
 
 NOTE: This table is not used in any code.
 
-- **derived_id** - Unique id for this derivation method. 
+- **derived_id** - Unique id for the derivation method. 
 - **tool_name** - Name of derivation method/tool
 - **tool_version** - Version of tool used in derivation method
 - **other** - Other details
@@ -191,15 +191,15 @@ Stores artifacts associated with objects.
 - **artifact_id** - Id of the artifact (assigned by the database)
 - **obj_id** - Id of the associated object
 - **artifact_type_id** - Id for the type of artifact (can be looked up in the blackboard_artifact_types table)
-- **data_source_obj_id** - Id of the data source for this artifact
+- **data_source_obj_id** - Id of the data source for the artifact
 - **artifact_type_id** - Type of artifact (references artifact_type_id in blackboard_artifact_types)
 - **review_status_id** - Review status (references review_status_id in review_statuses)
 
 ## blackboard_attributes
 Stores name value pairs associated with an artifact. Only one of the value columns should be populated.
-- **artifact_id** - Id of the associated artifact.
-- **artifact_type_id** - Artifact type of the associated artifact.
-- **source** - Source string, should be module name that created the entry.
+- **artifact_id** - Id of the associated artifact
+- **artifact_type_id** - Artifact type of the associated artifact
+- **source** - Source string, should be module name that created the entry
 - **context** - Additional context string
 - **attribute_type_id** - Id for the type of attribute (can be looked up in the blackboard_attribute_types)
 - **value_type** - The type of the value (see org.sleuthkit.datamodel.BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE)
@@ -214,13 +214,13 @@ Types of artifacts
 - **artifact_type_id** - Id for the type (this is used by the blackboard_artifacts table)
 - **type_name** - A string identifier for the type (unique)
 - **display_name** - A display name for the type (not unique, should be human readable)
-- **value_type** - Expected type of data for this attribute type (see blackboard_attributes)
 
 ## blackboard_attribute_types
 Types of attribute
 - **attribute_type_id** - Id for the type (this is used by the blackboard_attributes table)
 - **type_name** - A string identifier for the type (unique)
 - **display_name** - A display name for the type (not unique, should be human readable)
+- **value_type** - Expected type of data for the attribute type (see blackboard_attributes)
 
 ## review_statuses
 Review status of an artifact. Should mirror the org.sleuthkit.datamodel.BlackboardArtifact.ReviewStatus enum.
@@ -236,9 +236,9 @@ the org.sleuthkit.datamodel.CommunicationsManager API to create/access this type
 
 ## accounts
 Stores communication accounts (email, phone number, etc.).  Note that this does not include OS accounts. 
-- **account_id** - Id for this account within the scope of the database (i.e. Row Id) (used in the account_relationships table)
+- **account_id** - Id for the account within the scope of the database (i.e. Row Id) (used in the account_relationships table)
 - **account_type_id** - The type of account (must match an account_type_id entry from the account_types table)
-- **account_unique_identifier** - The phone number/email/other identifier associated with the account that is unique within the Account Type. 
+- **account_unique_identifier** - The phone number/email/other identifier associated with the account that is unique within the Account Type 
 
 ## account_types
 Types of accounts and service providers (Phone, email, Twitter, Facebook, etc.)
@@ -248,7 +248,7 @@ Types of accounts and service providers (Phone, email, Twitter, Facebook, etc.)
 
 ## account_relationships
 Stores non-directional relationships between two accounts if they communicated or had references to each other (such as contact book)
-- **relationship_id** -  Id for this relationship
+- **relationship_id** -  Id for the relationship
 - **account1_id** - Id of the first participant (from account_id column in accounts table)
 - **account2_id** - Id of the second participant (from account_id column in accounts table)
 - **relationship_source_obj_id** - Id of the artifact this relationship was derived from (artifact_id column from the blackboard_artifacts)
@@ -264,26 +264,26 @@ the org.sleuthkit.datamodel.TimelineManager API to create/access this type of da
 Stores the types for events. The super_type_id column is used to arrange the types into a tree.
 - **event_type_id** - Id for the type
 - **display_name** - Display name for the type (unique, should be human readable)
-- **super_type_id** - Parent type for this type (used for building heirarchy; references the event_type_id in this table)
+- **super_type_id** - Parent type for the type (used for building heirarchy; references the event_type_id in this table)
 
 ## tsk_event_descriptions
 Stores descriptions of an event. This table exists to reduce duplicate data that is common to events. For example, a file will have only one row in tsk_event_descriptions, but could have 4+ rows in tsk_events that all refer to the same description. Note that the combination of the full_description, content_obj_id, and artifact_id columns must be unique.
-- **event_description_id** - Id for this event description
-- **full_description** - Full length description of this event (required).  For example, the full file path including file name. 
-- **med_description** - Medium length description of this event (may be null).  For example, a file may have only the first three folder names.
-- **short_description** - Short length description of this event (may be null).  For example, a file may have only its first folder name. 
+- **event_description_id** - Id for the event description
+- **full_description** - Full length description of the event (required).  For example, the full file path including file name. 
+- **med_description** - Medium length description of the event (may be null).  For example, a file may have only the first three folder names.
+- **short_description** - Short length description of the event (may be null).  For example, a file may have only its first folder name. 
 - **data_source_obj_id** -  Object id of the data source for the event source (references obj_id column in data_source_info)
 - **content_obj_id** - If the event is from a non-artifact, then this is the object id from that source.  If the event is from an artifact, then this is the object id of the artifact's source. (references obj_id column in tsk_objects)
-- **artifact_id** - If this event is from a non-artifact, this is null. If the event is from an artifact, then this is the id of the artifact (references artifact_id column in blackboard_artifacts) (may be null)
-- **hash_hit** - 1 if the file associated with this event has a hash set hit, 0 otherwise
-- **tagged** - 1 if the direct source of this event has been tagged, 0 otherwise
+- **artifact_id** - If the event is from a non-artifact, this is null. If the event is from an artifact, then this is the id of the artifact (references artifact_id column in blackboard_artifacts) (may be null)
+- **hash_hit** - 1 if the file associated with the event has a hash set hit, 0 otherwise
+- **tagged** - 1 if the direct source of the event has been tagged, 0 otherwise
 
 ## tsk_events
 Stores each event. A file, artifact, or other type of content can have several rows in this table. One for each time stamp. 
-- **event_id** - Id for this event
+- **event_id** - Id for the event
 - **event_type_id** - Event type id (references event_type_id column in tsk_event_types)
 - **event_description_id** - Event description id (references event_description_id column in tsk_event_descriptions)
-- **time** -  Time this event occurred, in seconds from the UNIX epoch
+- **time** -  Time the event occurred, in seconds from the UNIX epoch
 
 # Examiners and Reports
 
@@ -303,76 +303,76 @@ Stores information on generated reports.
 
 # Tags 
 
-## tag_names table
+## tag_names
 Defines what tag names the user has created and can therefore be applied.
 - tag_name_id - Unique ID for each tag name
 - display_name - Display name of tag
 - description  - Description  (can be empty string)
 - color - Color choice for tag (can be empty string)
 - knownStatus - Stores whether a tag is notable/bad (as org.sleuthkit.datamodel.TskData.FileKnown enum)
-- tag_set_id - Id of the tag set this tag name belongs to (references tag_set_id in tsk_tag_sets, may be null)
+- tag_set_id - Id of the tag set the tag name belongs to (references tag_set_id in tsk_tag_sets, may be null)
 - rank - Used to order the tag names for a given tag set for display purposes
 
 ## tsk_tag_sets
 Used to group entries from the tag_names table. An object can have only one tag from a tag set at a time. 
-- tag_set_id - Id of the tag set
-- name - Name of the tag set (unique, should be human readable)
+- **tag_set_id** - Id of the tag set
+- **name** - Name of the tag set (unique, should be human readable)
 
-## content_tags table
+## content_tags
 One row for each file tagged.  
-- tag_id - unique ID
-- obj_id - object id of Content that has been tagged
-- tag_name_id - Tag name that was used
-- comment  - optional comment 
-- begin_byte_offset - optional byte offset into file that was tagged
-- end_byte_offset - optional byte ending offset into file that was tagged
+- **tag_id** - unique ID
+- **obj_id** - object id of Content that has been tagged
+- **tag_name_id** - Tag name that was used
+- **comment**  - optional comment 
+- **begin_byte_offset** - optional byte offset into file that was tagged
+- **end_byte_offset** - optional byte ending offset into file that was tagged
 - **examiner_id** - Examiner that tagged the artifact (references examiner_id in tsk_examiners)
 
-## blackboard_artifact_tags table
+## blackboard_artifact_tags
 One row for each artifact that is tagged.
-- tag_id - unique ID
-- artifact_id - Artifact ID of artifact that was tagged
-- tag_name_id - Tag name that was used
-- comment - optional comment
+- **tag_id** - unique ID
+- **artifact_id** - Artifact ID of artifact that was tagged
+- **tag_name_id** - Tag name that was used
+- **comment** - Optional comment
 - **examiner_id** - Examiner that tagged the artifact (references examiner_id in tsk_examiners)
 
 
 # Ingest Module Status
 These tables keep track in Autopsy which modules were run on the data sources.
 
-## ingest_module_types table
+## ingest_module_types
 Defines the types of ingest modules supported. Must exactly match the names and ordering in the org.sleuthkit.datamodel.IngestModuleInfo.IngestModuleType enum.
-- type_id - Id for the ingest module type
-- type_name - Internal name for the ingest module type
+- **type_id** - Id for the ingest module type
+- **type_name** - Internal name for the ingest module type
 
 ## ingest_modules
 Defines which modules were installed and run on at least one data source.  One row for each module. 
-- ingest_module_id - Id of the ingest module
-- display_name - Display name for the ingest module (should be human readable)
-- unique_name - Unique name for the ingest module
-- type_id - Type of ingest module (references type_id from ingest_module_types)
-- version - Version of the ingest module
+- **ingest_module_id** - Id of the ingest module
+- **display_name** - Display name for the ingest module (should be human readable)
+- **unique_name** - Unique name for the ingest module
+- **type_id** - Type of ingest module (references type_id from ingest_module_types)
+- **version** - Version of the ingest module
 
-## ingest_job_status_types table
+## ingest_job_status_types
 Defines the status options for ingest jobs. Must match the names and ordering in the org.sleuthkit.datamodel.IngestJobInfo.IngestJobStatusType enum.
-- type_id - Id for the ingest job status type
-- type_name - Internal name for the ingest job status type
+- **type_id** - Id for the ingest job status type
+- **type_name** - Internal name for the ingest job status type
 
 ##  ingest_jobs
 One row is created each time ingest is started, which is a set of modules in a pipeline. 
-- ingest_job_id - Id of the ingest job
-- obj_id - Id of the data source ingest is being run on
-- host_name - Name of the host that is running this ingest job
-- start_date_time - Time the ingest job started (stored in number of milliseconds since Jan 1, 1970 UTC)
-- end_date_time - Time the ingest job finished (stored in number of milliseconds since Jan 1, 1970 UTC)
-- status_id - Ingest job status (references type_id from ingest_job_status_types)
-- settings_dir - Directory of the job's settings (may be an empty string)
+- **ingest_job_id** - Id of the ingest job
+- **obj_id** - Id of the data source ingest is being run on
+- **host_name** - Name of the host that is running the ingest job
+- **start_date_time** - Time the ingest job started (stored in number of milliseconds since Jan 1, 1970 UTC)
+- **end_date_time** - Time the ingest job finished (stored in number of milliseconds since Jan 1, 1970 UTC)
+- **status_id** - Ingest job status (references type_id from ingest_job_status_types)
+- **settings_dir** - Directory of the job's settings (may be an empty string)
 
 ##  ingest_job_modules
-Defines the order of the modules in a given pipeline (i.e. ingest_job)
-- ingest_job_id - Id for the ingest job (references ingest_job_id in ingest_jobs)
-- ingest_module_id - Id of the ingest module (references ingest_module_id in ingest_modules)
-- pipeline_position - Order that the ingest module was run
+Defines the order of the modules in a given pipeline (i.e. ingest_job).
+- **ingest_job_id** - Id for the ingest job (references ingest_job_id in ingest_jobs)
+- **ingest_module_id** - Id of the ingest module (references ingest_module_id in ingest_modules)
+- **pipeline_position** - Order that the ingest module was run
 
 
 */