Various enhancements suggested by FauxPas app.