more compile-condf tests
clean up
refactored dismap