uncommented thrift open, corrected missing matches