Code and hardware tweaks and corrections.

Small set of adjustments - gathering more hardware and software
research for optimizations.