Another attempt to fill in missing data slots. Formatting and comment
cleanup.