_
oil parsing bug fixes