Updated  for less aggressive resetting; modified related utilities to fit. Closes #120.