Some fixes on client-side image loading; not working correctly yet.