CHANGE: modified and corerected make files