added wp8 fix, some fixes