most of the bugs fixed with xbel loading