adjust some tables and references