24/02/28 Optimized patches, drawing fixes, etc