Removing more debug code; fixing some tabs.