Improve image handling & correct some typos

Title says it all...

Merging