clarifying that W_en=0 where W=0; and minor stuff