Corrections + upgrade