Mac os files and improved Makefile / scripts