minor tweaks to FOXML templates