Bug fixes and an optimization to CustomNonbondedForce with interaction groups