Improved hover detection, added timer