Add more devices (closes #57, closes #58, closes #59).