goghspr updates

Made changes to device files based on goghspr