remove pdb. other minor changes