Added back ! in -s detection
Updated some rmsd values