Correction + better rendering + patches checked