MS Updates

Some formatting fixes