Fixes and additions. Can now mark images as demanded..