Changed header setup to be more generic. Made some patches to reflect the changes to the database column names.