Working on #738 Database optimization
Changed some columns to smallints