num machines bubble for location lists
Merge branch 'enhancements'