missed a couple things on the custom primary keys