Fix error where single whitespaces weren't counted.
Minor changes