image getting fix and other minors