Small changes that should bring this to a stable,usable, though very incomplete state