Fix todo items and clean up graphics.