Fixes #2412

Fixes #2285 (#2334)

SM Bugs

Closes #2054
closes #2170
closes #2205
Closes #2231
closes #2072
closes #2253
closes #2166

Bloody Bugs!

closes #2050
closes #2051
closes #2052
closes #2053
closes #2058
closes #2063
closes #2075
closes #2079
closes #2080
closes #2143
closes #2171
closes #2185
closes #2186
closes #2194

Erads

SM bugs

closes #1928
closes #1803
closes #1756
closes #1766

#1875 changes

Fixes #1853

Fixes #1822

Missed changing Ulrik keyword