lambda commented; more PNG support