wporg fixes

wporg fixes + optimized images