Properly set up auto-fill comments

Gotta tangle 'em!
Fix some tangling