New updates to folders/imageedit
Fix merge issues...