more fixing up of the module