all numbers wide, more bug fixes