Small changes in configuration
Makefile refactor to have small/reusable targets