New images+ fixes
Fixes