table2 up, blocks show rules now on table2
code cleanup
code cleanup