First commit after break. Fixed Oil bugs