Add type counters to type checks, add granular number types