Typo fix, plus some pretty connecty-line things.