debug variable left on in namecleaning, couple of more fixes to setup script