Worked out sudo-cacheing images into an NSMutableDictionary. Various other tweaks and cleanup