A couple of FIXMEs to code
use the new card images in the client
removed obsolete todos