cleaned up make files and fixed