Made some (more) variables operational