fixed ch 1 tables
adapted all tables