Devices

@Sean Lester, thanks for the feedback. Back from vacation and a few minutes to make some updates made all the difference in the world on these.

Cheers!