Minor changes as desired by @stof and @keradus