more updates. added .options.name reference to improve speed.