Updating EE measures to all have variable

Made update to measures and ee spreadsheet