Various changes to make this repo consistent.