SM Links, various fixes
final touches