Fix nestest bugs. Reset is blowing up on CCL, investigate later.
Updates for new cl-6502 package layout.