Updates to be a little less HW dependant

Tested on "wide" variety of hardware (3 laptops).