Fixed Eugene's mistakes