Made all variables overridable, fixed placement of NAME computing