Minor fixes
Condensed all table constants into 2 files