Added some more debugging switches