Refactored better handling of ein/eins/eine, and negative numbers