Set up various attempted improvements; not a lot of progress but backing up anyway.