modified the db, added some fields and changed to a more consistend naming scheme.