Minor changes for merge

@macumber Here are the most recent changes. I think I got everything - let me know if I missed anything.