re final tweaks and SEF for both modules