Added spanning lines, and updated defaults for their inclusion