Fix few nits and added references to Threat Model draft