more xmission branding and code cleanup