redirect milwaukee to wisconsin
include device type in machine comments
Merge branch 'enhancements'