BLPRO, CHDIFF and others cleanup & debug