Image refactoring.
Refactoring.
Bug fixes.