Updated set up file to use shorter check for modules and updated Makefile