minor tweaks for device, prepping for auth