Minor touches before starting Single mode version.