More changes to variables

cell type is now defined as an integer