Debug

Squashed bugs, which spawned more.