Makefile notifications, better test-coverageand some refactorings