added globbing for Smat.*.dat & minor cleanup