Feature/isotope fixes