Papal Enhancement and small fixes