updates to db, addition of incident tables and changes to fk script