Efficiency improvements for scanner, GUI dev