Moire fix and initial Kefrens