Some additions for navigating source and fixing references.