Modified the validations and the Makefile (few changes)