First merge of Xwt
Code updates