Improvements for word & character count