Hovering improvements and other fixes