Changed back dice, fixed minor bugs