some fixes
Merge branch '#76-HoverEdit2' into #77-Analysis