Further model improvements. Concerning X, mostly