automatic submerchant creation fixes; admin improvements