Various bug fixes, and rendering enhancements
improve number rendering