Better wording for safe mode option
Minor tweaks and documenting