updated fixed-up mooij files