Adding selection settings and other minor adjustments.