Grid saving & fixes