cleaning up the code some more (getting rid of old commenting, with the new primary key scheme).