Forgot binary flag on RGBA version of PNG save, coalesced saving of both versions, minor reorganization