Script source trigger changed to ComboBox etc

Also some other changes too