Running well enough to debug.

Bunch of fixes made, more to come!