Dev exp tweaks

A few suggested updates. It may be that some are rejected and we can cherry-pick the ones that are accepted.