Things seem to work better now. Still more work to do