compare everywhere, bug fixes