Better display in deep mode + minor changes