Bring Back Hover and some Fixes

This reverts commit 4158fae3da6e51f0fc2baefb36e9f6c7621075df.