1p for Surrounded, plus some chart fixes