Small changes, looking into making it load non amd modules