Better combo bonus computation. this close #18