fixes and changes + imgs