more little tweaks to modules GF