Added scaling and centering on charges
Other stuff