Various changes. Cleaning.