More work on the omit chapter + fixed table issue in exp chap