cs fixes + breadcrumbs impl