Fix square packing variants
Add mapgroup3 and use tolerance in hexagonal