added things
merging makefiles