Add Upvalues, remove globals

Fix several misnamed variables (options.option instead of data.options.option, new instead of update.new)
Commented out a section that does nothing currently, unsure of its intended purpose
These can be broken down farther to reduce lookups even more.  But even this helps some.