Split table_rule into db columns
Consolidated present forms

Fixed table 88 p2f/p3f, table 89 p2f/p3f, table 90 p3f, table 94 s3m