FIX:highlight fix
ENH:improvement in refactoring
ENH:go to declaration and refactoring
ENH:added settings and other improvements