Updating parser to ensure that a space or period finishes each unit.