Text and templates fixes, by tkoch.
Text and templates fixes, by tkoch.