Fixed bad (too speedy) implementation
Removed debugging information
Fixed the CN adapter