merged the latest changes into the making id auto increment primary key for lookups.