Re-organization. Minor secrecy/output update.