Cleanups & fixes.
One should actually be able to run it now, though not all the simple,
initial functions work.