fixed more of victor's mistakes