update to tokenable behavior
various adjustments associated with behavior changes