I was using /var/lib/tor..... and /var is a symbolic link to tmp so the private key and onion address were being substituted for a new one on boot. Fixed. Other cosmetical and minor additions.