Smooths ball addition/removal
flagged min hop dep
Merge remote-tracking branch 'zanderson/master'
renaming, cleanup