improved error position for closures (commit: d21d21b)
quickfixes for function and variable imports (commit: c05f84e)