Breadcrumbs and other fixes