reworked MODS to be more in line (wrt error handling) with other modules