Halo and Hover : cleanup and npe fix