Tweaks and png export