Fix up pydbgr and remake somewhat for recent changes