fix stuff + module management