Fixed sometimes faulty selection of the most appropriate MS2 spectrum. Also, added some more control.