[MULTI] Cleaning, new makefile, bug fix