Various improvements suggested by FauxPas app.