Clearer definition of debug map
Very minor fixes