Check Scanner - Bug fixes, sweeps, and tweaks