Added several things
fix Makefile