Updated tables

Tables now match the E/R i made to make the code make sence. :)