Fixed everything, added a makefile