A few minor changes

It runs now, but not a lot of progress.