Use decimal consistently and improve stats