Fix nameswap bug, disable google demonstration links.