HOVER: A few improvements