Fix MWB problems, update header from string to comments, fixing Spybot