bug fixes and updates for expl3 changes

closes #3