PngDrawer added and minor modifications