Merged remaining desired Smaug 1.8 stuff.

Grabbed the rest of what was desired from Smaug 1.8b.