Fixed some image bugs and added multiple images support