Simplified bracketed data code.  Added integer ranges.  Fixed things.