Added features and modification control.  Can not reproduce the selection bug, but this does demonstrate another bug found in Arbiter.