send nil instead of 0 for machines that aren't at locations
Merge branch 'enhancements'