Working on #738 Database optimization
Changed last few columns to smallints