This is a combination of 2 commits.

tweaks.