Minor fixes. Added .png output