Massive fixes and branding changes