bug fix, and more progress on the adding of devices