Added a bunch (whitespace detection too).