Correct handling of dummies in language, and made sure whitespaces work