Merge stuff implemented
Clean up Makefile