More cleanup and dice image added.