More fixes for PDB_DIR reading, plus some #111 and #155