Added local verbose option
Prevented calculation of electrostatic energy
Updated subsets
Updated methods for new datasets