Various fixes, added Merchant object, renamed Merchant service to MerchantSvc