variable issues fixed