Made some var adjustments