Hopefully finished optimization. Reduced code ambiguity.
Fixed a bug where protons did not interact with electrons