Fixed bug that prevented cross-crate map working, and some cleanup of item references at and.. stop it showing a link to an item- it steps to the first meaningful line