Improvements

wow cb() can be called thousands of times with error careful