Fixing return
Tweaking highlight groups