fixes and changes + imgs
fixes
one more dump
bef merge
Merge branch 'edd'
fix after merge