WIP - trying to fix specs. Don't run the specs on this version unless you're trying to help... this fixes a few, but it leaves a LOT of debugger calls in there, too, in order to fix the rest.