image changes and other fixes