fixes and added breadcrumbs