Additional Add-ons

Jump infrastructure was created and fix some scanner bugs.