Stormwrack
+ Some minor updates