Hover settings fix & misc cleanup