Updated Makefile to work with benny cluster.
Correction of several warnings + cleaning