Upload 20

various adjustments