Tweaks based on Adam's guidance

Revert a few things, remove a few others.