lotsa wstring fixes + others