Improving breadcrumbs

This PR improves generating the breadcrumbs and hopefully fixes some bugs. Specifically comparing a static string against a non-changing variable is simply a waste of perfectly good CPU cycles.