Improved verbose output and fixed a bunch of things pointing the right way for the wrapup phase
Fixed more debug output and final check for correct buffer