Changed primary keys in database: made them ints
more database stuff