Hi Joe,
For the organization control to load the information saved in Site Settings, you need to add LoadFromSiteSettings="true" to the control in the layout.master. Example: <portal:OrganizationControl id="org1" runat="server" LoadFromSiteSettings="true" />
The Public Email literal should be, as you have found, <portal:PublicEmailLiteral id="litEmail1" runat="server" />
HTH,
Joe D.