fixed module names, other problems