fixed some outdated function references and added a fix for a module which does not load