Fixed breadcrumbs plus some other minor fixes