More primary key work.  Fixing some bugs in the create and insert statements