Bug fix, and progress on adding devices.