fix numbers
fix warnings