Cleaned up wikipedia, added rio