Fix up for variables and ability to add variables to itemlist