Improvements all around.

It's not really usable yet, but getting there.