Reworked how whitespace is handled, and Capitol words