changed all the debug statements to macro version. diff looks weird like I replaced the entire file - maybe that's because of macro read/write. If so, that's a bummer.