Several tweaks to 2d peak finding to improve its performance based on new data from Quentin