Changes to the various bulk similarity functions for #119; not closing yet since there may still be other places that need to be updated