Tweaks

See if this makes any sense. I wanted to break up the first step into smaller chunks --- but I ended up doing too much.