Merge SQL and minor link fixes

Merge Milestone into ScrapAttack SQL.