intermediate save
merging with kli's update's after long and fruitful discussions on potentials