Big changes to squash bugs and accommodate the Maplantis data