image uploader bugfix and inline-image macro