eqeqeq added, two fixed