Include password credentials in info passed to template render; fix some typos and remove some commented code