moving Andor to common
merging, improved ion fitting routine