Matrix are finally importing correctly. plus an update to the name text
buffer to more accurately check for matching values.