Correcting otter & otter2 & adding a few devices.