Various changes, part two