Breadcrumb cleanup, misc bug fixes