Goto definition support, bug fix