Fix image bugs

Resolves #31