Fixed header, and fixed small limit on # of devices.