Updated make and fixed issue in main