fix: image loading improved
fix: image loading improved
fix: final image loading
fix: some fixes to support recent builds