issue #20734: Add in some missing models and fix formatting problems with files.