more fixes to the extent that it's now usable

There may or may not be lurking bugs; but it is functional