Update to the latest code

Also a fix I found necessary for my debugger to work.