Bug fix (regions/hierarchy separate options now).
Minor cleanup