added device tweaks

Originally committed by sbdags