Added move operations to store and fix for mizuiro
New image functions and cleanup