Various changes, too lazy.