strict cleanup
added make support