fixed broken module import + maintenance