tweaked ImageLoader and cleaned TODOs