Updated control statements; set correct path variables