Various module improvements