Better options + rename to ImageManager
Bugfixes