Fixed up the var inin in starage and ignoring stuff