Increase width of counters, use bool where appropriate