South Africa's Upstream Petroleum Bill could do better : vim